]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
Correct the systemd version required for ConditionEnvironment=
authorHans Ulrich Niedermann <hun@n-dimensional.de>
Fri, 23 Oct 2020 08:42:38 +0000 (10:42 +0200)
committerMarge Bot <marge-bot@gnome.org>
Wed, 9 Dec 2020 15:08:15 +0000 (15:08 +0000)
According to systemd's NEWS file, the ConditionEnvironment= setting
has only been introduced in systemd 246, not in 245 like the comment
in the services files claimed.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1472#note_942075

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1472>

data/org.gnome.Shell@wayland.service.in
data/org.gnome.Shell@x11.service.in

index 692d45bb37ab5c1780dfbcaef55304a0f55e8692..12f7fbaa792f3b8bba78177fb1d80c89763b5970 100644 (file)
@@ -17,7 +17,7 @@ Before=gnome-session-initialized.target
 Slice=session.slice
 Type=notify
 # NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I
-#       with systemd >= 245. Also, the current solution is kind of painful
+#       with systemd >= 246. Also, the current solution is kind of painful
 #       as systemd had a bug where it retries the condition.
 # Only start if the template instance matches the session type.
 ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'
index a70f2490957eea9c5d51dcf3e66f85c443972ed8..f2ff0ce34aa8677313aedc6695b18701722e3003 100644 (file)
@@ -21,7 +21,7 @@ StartLimitBurst=3
 Slice=session.slice
 Type=notify
 # NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I
-#       with systemd >= 245. Also, the current solution is kind of painful
+#       with systemd >= 246. Also, the current solution is kind of painful
 #       as systemd had a bug where it retries the condition.
 # Only start if the template instance matches the session type.
 ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'